8381868: Upgrade to JLine 4.0.12#30767
Conversation
…the fallback (caller will fall back to ansi).
|
👋 Welcome back jlahoda! A progress list of the required criteria for merging this PR into |
|
@lahodaj This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 692 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
Webrevs
|
This upgrades the JLine embedded in the JDK to JLine 4.0.12.
The upgrade as such was not very difficult, but for historical reasons was done in two steps: I first upgraded to 4.0.9 using a usual process of taking a diff between existing master and the corresponding JLine (3.29.0 in this case), then replacing it with unmodified new version of JLine and re-applying the patch. The I upgraded from 4.0.9 to 4.0.12 by applying just the relevant differences between these two versions.
Other important notes:
jdk.internal.lewill implicitly now fallback onansiif it does not recognize the terminal.java.desktop, and we don't have a use for it at this time. And the graphics support is fairly standalone, can be avoided/not-included. So this upgrade is not including this graphics support.To potentially help with the review, this is the patch between JLine 3.29.0 and master:
https://cr.openjdk.org/~jlahoda/8381868/jline-patch-3.29.0-2.diff
this is the patch between JLine 4.0.12 and the code proposed in this PR:
https://cr.openjdk.org/~jlahoda/8381868/jline-patch-4.0.12.diff
and this is a meta-diff between these two diffs:
https://cr.openjdk.org/~jlahoda/8381868/diff-of-diffs-3.29.0-4.0.12.diff
the meta diff is not straightforward to read, but I went through it, and it seems OK to me.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/30767/head:pull/30767$ git checkout pull/30767Update a local copy of the PR:
$ git checkout pull/30767$ git pull https://git.openjdk.org/jdk.git pull/30767/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 30767View PR using the GUI difftool:
$ git pr show -t 30767Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/30767.diff
Using Webrev
Link to Webrev Comment